From: Jim Blandy <jimb@redhat.com>
Date: Sun, 30 May 1993 17:28:33 +0000 (+0000)
Subject: * faces.el (x-resolve-font-name): Give correct error message
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95762
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=25c08a32eddb9daf6029dade09bb7a97515ff9c9;p=emacs.git

* faces.el (x-resolve-font-name): Give correct error message
	 depending on whether or not FACE was non-nil.
---

diff --git a/lisp/faces.el b/lisp/faces.el
index 4b6d3812d2d..7788617ea27 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -428,9 +428,9 @@ also the same size as FACE on FRAME."
       (let ((fonts (x-list-fonts pattern face frame)))
 	(or fonts
 	    (if face
-		(error "no fonts match `%S'." pattern)
-	      (error "no fonts matching pattern are the same size as `%s'."
-		     face)))
+		(error "no fonts matching pattern are the same size as `%s'."
+		       face)
+	      (error "no fonts match `%S'." pattern)))
 	(car fonts))
     (cdr (assq 'font (frame-parameters (selected-frame))))))